-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Solution for #6889 #29929
Solution for #6889 #29929
Conversation
@SpamReceiver sorry for coming back to you so late. Can you please rebase this to retrigger the CI? Thank you! :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice addition, the bullet points are what I've always missed when referring people to the docs, thanks for adding!
Help! What do I need to do to complete this ticket? |
@SpamReceiver you need to sign off your commits, see https://github.com/nextcloud/server/pull/29929/checks?check_run_id=6858670749 |
Thank you very much for this link. Unfortunately, I have done the edits via the Web GUI and have no local git. Is there a way to fix it? I discovered "xxx commits behind master" --> "Festch and merge", and now I have another commit, but there was no way to enter a commit message. :-( |
Hi @SpamReceiver, if you do not want to do it locally, you can otherwise simply create your change from the github web gui on a new branch and open a new PR with that! Do not forget to sign-off your changes directly though! |
Okay, I downloaded 2.5G via the clone command and followed the instructions here: https://github.com/nextcloud/server/pull/29929/checks?check_run_id=6858670749 Now, this thing still displays "Merging is blocked". What am I supposed to do now? |
Try to do your changes again here https://github.com/nextcloud/server/edit/master/config/config.sample.php and create a new PR from that :) |
New pull request: #33470 Please review! |
Superseded by #33470 |
See also: nextcloud/documentation#7046